Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 6 Feb 2010 13:36:05 +0000 (13:36 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 6 Feb 2010 13:36:05 +0000 (13:36 +0000)

Trivial merge